Make waypt_head non-static. The purity isn't worth the pain.

Add test for magproto to testo.

diff --git a/gpsbabel/ChangeLog b/gpsbabel/ChangeLog
index e4e085b631beabe2bd8b39052443247ba9e7f24f..ff0fd40fcf7739309fbdfdc55a0c27acf6f885ac 100644 (file)
--- a/gpsbabel/ChangeLog
+++ b/gpsbabel/ChangeLog
@@ -1,2 +1,5 @@
 NEW: blah blah
 NEW: Add Cetus support.   Thanx to Ron Parker and Kjeld Jensen.
+NEW: Windows support.  You must download and install the expat dll if you
+       do not already have it.   Get it from
+       http://sourceforge.net/projects/mingwrep/

diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index d261a1b553f85148275c7998d0a9f533435b15a1..dc226adfaa24fe36b680016838feb59231263453 100644 (file)
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -524,6 +524,7 @@ mag_wr_init(const char *portname)
 }
 
 static void
+
 mag_deinit(void)
 {
        mag_handoff();

diff --git a/gpsbabel/testo b/gpsbabel/testo
index 995f64638660086d16b77ac909ae0f58ab0e6c25..73a7dedae23bceac444f577e5367c4a4c8531aa4 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -50,3 +50,7 @@ ${PNAME} -i geo -f geocaching.loc -o pcx -F /tmp/mm.pcx
 ${PNAME} -i pcx -f /tmp/mm.pcx -o gpsutil -F /tmp/pcx.gps
 diff /tmp/mm.gps /tmp/gu.wpt
 
+# Magellan file format
+${PNAME} -i magellan -f reference/magfile -o magellan -F /tmp/magfile
+diff /tmp/magfile reference/magfile
+

diff --git a/gpsbabel/waypt.c b/gpsbabel/waypt.c
index 20bb03bc389a941da9cd6d0197a5931f04eb4931..0e47703c71267c3dcb2b6ff52f12758fb47f609a 100644 (file)
--- a/gpsbabel/waypt.c
+++ b/gpsbabel/waypt.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "defs.h"
 
-static queue waypt_head;
+queue waypt_head;
 static unsigned int waypt_ct;
 
 void